Revert 57aea22b1179521a6bd2cdaf2acfc3cb33d9a711