Revert 852d97f..3388d88

This rolls back to commit 852d97f03a518cc788573115cdfba19d1888f3d8.