This reverts commits efc4fb5288d39e66a81df3707255278b33506232 and bc816febfca84fed80ca96d499bb5e034b0f8e8f