Bug 937721, Part 1: Back out cset 8dbd3f432835 (bug 932176), r=kaie

--HG--
extra : rebase_source : 80f4b7ee7e4f77ef92cb42e6163f95074d68d306
Bug 937721, Part 2: Back out cset 61fb80e560de (NSS_3_15_4_BETA2, bug 898431), r=kaie

--HG--
extra : rebase_source : 9b588bc5ba6e6a8ddd630e22ddf27667d6951edd