Revert 48e90b00f40305342a5608d835e68f2c4695961a