Revert v13.06