This reverts commit 6c04378e20. Reverting a series of Octave commits for re-applying again without incorrect whitespace changes.
6c04378e20