ESSENTIALS-198: simplify the code / improve UX.