Restore MessageFormatter defaults to reduce master..sailfish diff