Partially revert 85be70c33d50ae89da0e7fb59a3234d9e284352f

Pushed local changes by accident