Revert 1c7853c..33af6e2

This rolls back to commit 1c7853ca2661a6bde09046ae2227ce44d6d78c05.