Bug 864556 - Follow up, land the part of the patch that never landed. r=gwagner a=leo+