Back out 7579823b624a (bug 899987) temporarily until the underlying bug is really fixed