-Revert parts of 84326 and 84411. Distinquishing between fixed and non-fixed