Revert e4933f2..b3c793a

This rolls back to commit e4933f2c0ac838bcc74c5d3ff69e3ec3cfceb439.