Removed ahead of 2.3 release