Revert commit c08164bdf37371cf5746506db6b7a9fe535bd367 as discussed in issue #41