Reverted to version 21 configs.