Let's check this in as is. We can create a follow-up ticket to find a better way (if any)