fixes #592

These changes look unnecessary. Please revert.