Temporarily reverting r223443 due to bot breakage.