Revert "revert back to old syntax"

This reverts commit f04f4da40da82e793c5eca2e10f1341df1c7dd75.