Just keeping the warning message that you got rid of seems like the right thing to do.