Proper v1.2 support.