I'm still not convinced this is necessary, but we can revisit later.