Backed out changeset 5706a9c6704a (bug 913614) for OSX bustage. a=backout