back out 5aa9b76448b5 (bug 960584) for bustage (it depends on fix that hasn't yet landed)