Revert "Merge branch 'issue_253' into issue_255"

This reverts commit 9d2061963953034f07e3aab32e8cb6c453a9fd1b, reversing
changes made to f3d010d0e2de3609235559316fc7629d71992f22.

Conflicts:

	docs/CHANGES.rst