Revert 395228d..e2b2d15

This rolls back to commit 395228d9027e556ff742a9bbe04d78057df54be5.