Revert: 'amami: Clean up old cruft'