Previous merge forgot to include the new configdb header.