Revert c630409

More fixes to come later