Issue 4141: Make it go away