Revert 8f858e8..fe6c093

This rolls back to commit 8f858e87eece5e793df5efbdfee789fc5a697178.