Don't leave stray comments over.

But let me repeat it here: If you plan to implement the "include if public" behavior you can basically start over since that has quite different design implications, making it a 2-step process doesn't make a lot sense to me. Also I'm not sure it's a good idea to merge this if it the intended feature is basically undone.