Fixed metadata going away on remount

Change-Id: I79269fe651f2bfd04c17597939e7389452580e3a