Revert "Merge remote-tracking branch 'upstream/master' into 434-readthedocs-documentation"

This reverts commit 9c82abfa8ee1d98d1ae42d403b0b177ad42540b6, reversing
changes made to bf1fd272dfdd5e4abf304474d56e338a7747061d.