1 more reversal from 'rebundle' commit (00b921e24fd38c4241efe2d270c64527d1bb204f)