Revert 8729354..dff8333

This rolls back to commit 872935483d073224df12c9ed352e9d4849050a82.