Summary of changes:
8c1dd37... Clean up hacks that no longer affect the builds (*)
ac5b020... Fix the build without reverting b9c5f8b2ff9 (*)
9fc12d8... Update to 29.1.53.20181105git9f0acf372d from branch fixes/2 (*)
(*) This commit already existed in another branch; no separate mail sent