Revert 7a26905..2501762

This rolls back to commit 7a2690535217dfd45a509ab88562d4e3305b0e1b.