Partially revert GIT hash 180026c72f0e1d3ef365b2214288d4a543a238dd