@ebolyen I'm okay with postponing this change for now, but can you please create an issue so that we don't lose track of this?