Added a temporary and unoptimized solution to URI-1121.