[BUGFIX] Restore file replacement

Change-Id: I3960fa92992554c5362ec8fe591d29f616f48d3e