Backed out changeset bf9cc4b2aae6 (bug 996848)
Backed out changeset 4341602f99b0 (bug 996848) for reftest failures on OS X