Reverting r223513 and r223514.