Use new version of make_default.

Commit 32fb701749782eb6a09e6f586f39fb1111e43cd4made a new version of the
make_default function for user's but forgot to activate it.

Change-Id: Ia7540f05f6a9de2a67cbb3f3256afa446710ad2f