Revert "another incompatible change"

This reverts commit 7e47a01eee22285bd4d1315fdfae02d3b6337321.