This reverts commits 003705ef0835d9b0db805a384b749172dfdca022 and ef615b5a61c049317da5ed5637e4561b224dd66d.