Remove workaround, constraints is available in >= 2.1.4