Revert "Remove obsolete Z_-definitions"