Revert 176accc..e2ed30d

This rolls back to commit 176acccd32c7a765b963c5991dbda8a93f5c75cc.