Revert to cc823a81dfeed05ed9b750d836378be34e134fd2