Remove remaining usage of 'default_*' attributes

2 jobs for master in 7 seconds (queued for 4 seconds)