CGIV-4063 Set default mode to original value