Revert "Malero's mod"

This reverts commit 55f10874bd0335acb1baedc6fca3e9e2ac69dd77.