Revert b1021d6..b00be67

This rolls back to commit b1021d653de5bc391cdff3bc1622037096b0309e.