Merge "Revert part of previous change."