Pls. fix merge conflict. This method has been removed