Bug 1552: revert https://bugzil.la/951618