revert: previous commit overwrote mappings updates, this commit fixes that