removed extra function after upstream merge