Backdropping dependencies so master can compile

Restoring back master's position to a compilable state so `ant dist` can run happily.