Remove 2.0-only syntax and use the clunkier old-school syntax