Revert 3c6a33f..79deed7

This rolls back to commit 3c6a33fd974bc26902a90376226bef00df79e1e5.