bug fix
Merge pull request #407 from CJentzsch/bugfix

Revert previous changes because of wrong gas calculation in vm tests