Revert 395228d..8f4c435

This rolls back to commit 395228d9027e556ff742a9bbe04d78057df54be5.