Revert to 049e3ddd720cf75efae9b61fe0ebd13f7f758d25