Revert "patches: New Plutonia-compat patches, replacing lame placeholders"

This reverts the last commit, which introduced new alignment issues,
see issue #121 for details.