Revert a0745e9..326649c

This rolls back to commit a0745e9bea27a825c3202d200ffb5f185e8d3d54.