OPAL-1928: Revert local changes to TempDefaultConfig