I'm still not convinced this is needed.