Landed in r13243, reverted in 13247 (because of some weird merge artefacts which caused test failures), then properly re-landed as r13248.
Landed in r13243, reverted in 13247 (because of some weird merge artefacts which caused test failures), then properly re-landed as r13248.