Revert of `5f6abb8` to ensure strict v1 compat
- Refs #293
Release 1.10.10