Revert 334ce81..92b152b

This rolls back to commit 334ce8116f93448dcc25b1db006b08cccdf6b181.