It's a half measure that fully fixes my problem and Eric's problem with master as it is now