Bug 883959 - re-land part of previous change that was accidentally reverted. r=me