Ensure we stay 1.8.7 compatible for v1.3