Revert 6379dec89ed7497229c42b185e1bb2b9eb4db585