Revert fa30e18..cd4342d

This rolls back to commit fa30e1865f9d64e06ce78b2390989c795eeaaee4.
Revert 904aba1..343c0d4

This rolls back to commit 904aba146574c9d9ea6c6e1b483000d7f768e693.
Erroressss D: