Should we not be using the deprecation handling code for this?