revert pull request #30 - my mistake

Change-Id: I6aa19db1ea2792941c3a70bbcdfd587fe99c5769