Revert 20761c7..1954fe7

This rolls back to commit 20761c76013b1b681f2897c7743c85a5be7df309.