Revert 80afce5..1898227

This rolls back to commit 80afce585f3dec4d88fcd743045dbdbbad04d5f6.