Leave v0.10 compatibility