Revert adding the key alias to the 2ndary indexes names (from 5378 patch)