Revert 604648a..1cde1b0

This rolls back to commit 604648a4a6cb33a57e7c55e9a6d8e98948267176.