Reverts change in ef17c0456c441a812311664207727de32f7b8d66, fixes #216