This was committed with D153598 merged into it. Reverting to recommit as separate patches. This reverts commit 690b1c84.