Merge "Temporary hack until we have dynamic remounting."