fixes #1427
Revert "fixes #1427". I believe 513c0f8eebc2486a978abcce74978e8723f5b858 is a more maintainable patch.

This reverts commit cd63a10d9f3dd55c85080add7945e369df31d727.