Revert e90c5f7..cf73d78

This rolls back to commit e90c5f76f1c1d04d8ee66035b18b7399f3e4821a.