Revert 4c41dd3948d707a464efa0d126086efe9b718a91