Revert to 2074cb76