Revert "More Fixes #991"

This reverts commit 7d15cfb1bf0f7d8b72958950e8c1c590cad1e0e3.
Revert "Fix #991"

This reverts commit 89a5a3b459058482e621778cb9ddd10aedcaf741.