Revert 9da6293..eab5139

This rolls back to commit 9da629388bd7a1650d60dccf12807d6050f3a08b.