To test manually revert Bug 933035 - v1.4

    This reverts commit d808643fb7fca3fe6ffd1e415c135fe2d482e7df.