Revert 4e388a2..245a336

This rolls back to commit 4e388a26d1d65f478356446e8da660ea88ff1edf.