Revert "Merge remote-tracking branch 'upstream/master' into rumbo-150mm-mount"

This reverts commit ae99520040702fe5a22447b617b73655118483b6, reversing
changes made to 404e6001ea96bc5b7821a9e383c3ea5b60718654.