Revert "improve retrocompatibility"

This reverts commit a024f6a10f2922fb718128a104d4bdfcfce6164a.