backouts bug: 1090978 - rev: 631924cf37da