Revert 3141a87..82769a3

This rolls back to commit 3141a877bb475808951f61061ddb68817f437c8a.