Revert e7acbde..1361b55

This rolls back to commit e7acbde9bfff2741431e20672406ce2b7814ba60.