Backed out changeset f96fe425680e for cuasing OSX reftest failures