Revert of r213521. This change introduced a non-hermetic test (depending on a