Revert committ from Conrad's first beta for Armadillo 3.930 -- should go to branch

This reverts commit 73ef888e9305c34278904395ec49d0fc4140c41b.