Change visibility to aid testing on 5.3