[[ Bug 12885 ]] Tweak to enable server build