Revert 604648a..39a87d4

This rolls back to commit 604648a4a6cb33a57e7c55e9a6d8e98948267176.
checked