Remove use of private API that apple complains about now