Revert "SCALAR => IS_FIXED"