Revert 3d59009..c52041c

This rolls back to commit 3d590095b5d6a7dbc4e59f42a794377faf9db5a2.