Back out 57bb160f49d5:4e6b16f0d753 (bug 875157) for breaking master password tests