@salmon-summer-38098: rather than reverting https://github.com/pantsbuild/pants/pull/6509, you could maybe just go ahead and land the notes in master