Revert 009da2c..4087dc6

This rolls back to commit 009da2cdf94b6521d7a824a0cd395396b3d013f4.