back out ac18c74b3a2c (Bug 874736) since it was independently fixed elsewhere