Reversioning to match upstream