0.10.0 compat:
Revert "0.10.0 compat:"

This reverts commit 9616e67b1d951e13ddbb9795e7fbd3d145c8addd.