!UPSTREAM: Temporary debugging hack to test RT resolves