Revert 0a797f1..0f8fe4b

This rolls back to commit 0a797f1519754e386e7180c93ad16cbf75a4c0bf.