bug 855095 - further spring cleaning