Revert 1e9419c..cf7b6b6

This rolls back to commit 1e9419c83bf921889f50f944debb143babf35d20.