Out of the scope of this PR, but I agree that it should be tracked and fixed for the application controllers that we decide to keep going forward.