Revert d40e4bb1d96e38b970b728f742adf4cd59632221 and 189ece9a0632e3f5c27d6c63184b335d1c81b881