Revert 0f0274a..5a9618c

This rolls back to commit 0f0274ad186a8803fa821d67bc2aa090c1acb94c.