Revert 719008e..c80de3b

This rolls back to commit 719008efd01cf7aeca1ceeb482b9dd8562d8bba5.