Restore 2.8 compatibility