This reverts commit 1b40bfc8.

Reason:

So far the deprecation didn't show that will provide performance
improvements, and it's not clear that the new syntax is better than the
old one.

To avoid churn to the users, we should keep the old syntax for now.