Override cancelled as problem is fixed upstream