Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this
Merge remote-tracking branch 'upstream/master'