svenheiberg Make the deprecation more explicit