Follow deprecation

I only now (once the other PR was closed) understood what @jsuereth was suggesting. This is the change. Please accept.