Revert 565323f..0a36b99

This rolls back to commit 565323f31da8e1dcaafd220d563780d6492eb630.