Revert 34697ed..f46f386

This rolls back to commit 34697edd35ad476c706fb9e89b61da20b1020f25.