Revert changes that were meant to be sent as a single commit with summary for the differential review, but were accidently sent directly. This reverts commit 3bc5353f.