Bug 839923, addressing review comment