This was pulled in from @Amerdrix's changes, and I agree with him.