Revert a34ec78..3d8efc7

This rolls back to commit a34ec78d3fb929200238ef396dea9b1ef0deb1ba.