This breaks some buildbots (on the declaration GSS& GSS), will fix it later. This reverts commit eac22d07.