1.0 compatibility
Revert "1.0 compatibility"

This reverts commit e6e01a67a7e2342594279a5c9375ad0ae8659bdf.