Revert "Use the streamlined syntax"

This reverts commit a0a32f4946187517826c1f511a8e0c47e3f884dd.