This change has a good chance of breaking user applications.