Issue #148: revert change to master