Revert 91c8b22..1940bd6

This rolls back to commit 91c8b226eb91746802795ee3ddcd218c8322593d.