Revert 1770eb6..d92a0b2

This rolls back to commit 1770eb6399e1af9f0606e97ccad517055c005101.