Revert 1a42f07..05021d3

This rolls back to commit 1a42f07505de5ab82ac8ec13ecd235135f9a1ba4.