Revert 27499d6..f2cb298

This rolls back to commit 27499d64fea0cf21189805deedef984182d79419.