Revert 1db281b..54887c6

This rolls back to commit 1db281bdd60e2344854f8147999f774386e7f196.