Revert 8db52d3..1c0db83

This rolls back to commit 8db52d3c2b0d45701c05e6cbec4a59cca923a727.
Revert 1c0db83..b224b1d

This rolls back to commit 1c0db83733c0a629c80fb7fa56c27ced39fcc0b8.
I somehow fixed all the errors