[PATCH 3/3] Ignore the home directory setting if no change was requested (#1119900)