#4581: Fix build, try 1