Partially revert 6c0e30d98564e6b43ff92f08b5343150430dde4a