Partially Revert "partial niecza fudge"

This partially reverts commit 6312c187880ad4e8da1cde7df665f6f17ad9f501.