Revert compatibility issue fix