Previous commit accidentally broke build. This is a fix to allow the
branch to build.