Revert 4dd421e..e4436bc

This rolls back to commit 4dd421ea38bd072818bdf657e0676f412008166d.