Revert 9b720c2..cde0882

This rolls back to commit 9b720c2d3916f66d6b4bf86cfd5a7c87699ed995.