Revert 32350a8..4b52830

This rolls back to commit 32350a810387788cceb9aca1b64cd3f91b22a12a.