Revert "armani: try fixing build?"

This reverts commit f5cca2a73784e485b57f41e752f41ed933f6daf6.