Switch to using directive for full form.