Original Map Format rolling back

Original Map Format rolling back