(cherry picked from commit 89cf5038)
Closes #206 (closed)
This will create a new commit in order to revert the existing changes.
