Revert "Merge remote-tracking branch 'luke/rect-scan-numframes' into develop"
Revert "Merge remote-tracking branch 'luke/rect-scan-numframes' into develop"

This reverts commit c36864585a1e5ed24ab9b46f76e38f876f2b2533, reversing
changes made to d10d168246252edcb7831fb03854643c7477c359.

mgraupe/acq4,mgraupe/acq4,mgraupe/acq4,mgraupe/acq4,mgraupe/acq4