Revert ea42ef1..f5078ad

This rolls back to commit ea42ef1034316a1dd0d8bd7e39962c0ae9aa8a48.