Revert "#1123 Better fix"

This reverts commit 597c25365f0e14911e3d930cea11673a9e6da820.