[PATCH 21.5] Fix build