Revert 0f20c28..b7a094b

This rolls back to commit 0f20c2879bbd683b1397d5b2d3a807b4b43a88db.