Fix for issue 4060. And no need to source the UI.