r4446: attempt to fix the build - andrew, can you check I've done this right?