Partial backout of changeset 1a50eaa93b36 in an attempt to fix the Mac twinopen perf...