Reverting r243386 because it has serious post-commit concerns that have not been...