Revert 1009951..f245ed4

This rolls back to commit 1009951bda1380f9d9ddc4392210d830acb161af.