Uncomment shortcuts for now.