And use it both in the core interpreter and the configuration UI.

Change-Id: Ia2a16fcb53025840d906864b564255cd3c53e8e9