Revert #18: Initial 14.04 branch, not sure how this got in there