Do we need to grep the codebase to make sure these changes have been applied?