Reverts change 0a46e5d76264b196866c1ec8805e7ef34bf18aa2 originally for PIR-839.