Revert 013418e..eb4d400

This rolls back to commit 013418e8ea1671cc2a4595e4cbceccd65823fc1a.