manually revert pull-request #15