Merge "Refactored code didn't make it into previous CL"