Removed to prep for 1.7