Monkey-path to support deployment on Ubuntu 14.04 - Fix merge error