Revert Bugfixes that introduced bugs

Those commits revert commits that were introduced as fixes into our stable release but produced bugs and made OE 4.0.5 worse than OE 4.0