Revert 2e98f78..86ec8af

This rolls back to commit 2e98f787fb75aa1e8068090579eef876f43c2d18.