Fixing for octave-3.6
Revert "Fixing for octave-3.6"

This reverts commit 3590fbc4c03027b189816f21fd6ef6428202f8c8.