TAP5-582: reverting commit d96b5534fc02d8d12b75eafae18c276d2ddf11f4 because it used an organization for messages files not used anymore.