Revert b42ff8e8aa566e4854542852c7fd051070f24451