remove unnecessarily tricky code

This code was mentioned in #609.