Revert 3874ecd..8259204

This rolls back to commit 3874ecd16528016da7ec651faaedcc03c9e480a7.