Can we add a comment explaining why this is needed, and possibly a TODO to remove it when/if it's no longer needed?