Revert "Merge branch 'bayercustoms' into bayercustoms-winterwonderland"

This reverts commit 4f4327a7a4cf16379be6c3fae1da18426b37c005, reversing
changes made to af8f3a2e51a2833a08be3723f1cf06d1e606eb3f.
Revert "Revert "Merge branch 'bayercustoms' into bayercustoms-winterwonderland""

This reverts commit acac0166a711b4fa499ee12111b7a5db9649e619.
Revert "Revert "Revert "Merge branch 'bayercustoms' into bayercustoms-winterwonderland"""

This reverts commit 538fdaee6a9d5a1f23b26975455e1153a9fb1c66.
Manually fixing the shit I fucked with the goddamn piece of shit faulty
no-commit merge