This reverts commits 318175cfe2b23328f1b5f13812fd59cfd45fe1dc, e7ab760392b9691a6c730b7e0d660b7874969e70 and 3b35af63f608438b1882756feca94a6ebdd0d6a3 (PR #11537).