Ideally we'd change the name of the method, but we can leave it like that since I want to merge upstream.