Revert "optimizations and modifications for ROM updates"

This reverts commit e9848e5f6447dd1568777f98fcdbfdb446772429.

Change-Id: I6345ae09c5f65ed2c68173ae6e0d129b5e746d8c