Revert skin to stay in line with trunk
remove more cruft from master_sync