Revert to 8f99997cf441b4acc3d91c189d09fd2ea0de8831