Revert d68f077..c6bd41e

This rolls back to commit d68f077f9eae09694b53909a78ffdc162c1f8421.