Merge "Revert "Example for disabling changes at test time""