Revert 097950c..7b705c1

This rolls back to commit 097950c6094833ecad3c7655627c0b4adcf372bb.