Revert 1b40ecf..2ecbfbf

This rolls back to commit 1b40ecf1754276de94a360b68f0c837d5ac3e2c2.