This reverts commit 131201a7.

This commit was intended to remove deprecation warnings. That would have been great if it was specified in the original commit message...