revert build & docs patches in favour of PR#431

- revert a7ff2973de4cd39638f8639ad1336cc2e6282de2
- revert 8137c2c503712b8af84c7a8c22f7179bd5437506
5 files changed