I tried to separate the deprecation block to make it easy to spot and remove when the time comes, but I don't mind removing it.