Revert 2409601..0ed6043

This rolls back to commit 24096019a285fe919c6004db55b2d3f08779f30c.