Revert "simplifications"

This reverts commit 11a68207654eaaff5cb65e187eadd06b16beb9d3.
Revert "remove problematic line"

This reverts commit 439d42291304261dac007df193aa709fde17e344.