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