Imported patch from Redpine, see: #69 (comment 73932)
Fixes #69 (closed)
This will create a new commit in order to revert the existing changes.
