Backed out changeset 49502f43bd03 for landing with the wrong bug number.
Bug 820391 - Backout revision 4741ef815af9 for various regressions.
DONTBUILD