Revert 6a26674..14cad01

This rolls back to commit 6a266746a20de84a33c9935ca23596f3affd1133.