Remove commented out thing.  The current solution is what I settle on
for now.