This method is now in #657.