Revert "Merge pull request #1213 from ErikZalm/Marlin_v1"

Reverts ErikZalm/Marlin#1216