Issue #1804 build failure was fixed.