Backout #1549 to mark Bug 952549 WONTFIX