Revert "21368"

Reverts gudon/amis#2