diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py
index 8707bf4fc13..648af8ff282 100644
--- a/lib/ansible/module_common.py
+++ b/lib/ansible/module_common.py
@@ -40,8 +40,8 @@ MODULE_ARGS = <<INCLUDE_ANSIBLE_MODULE_ARGS>>
 MODULE_LANG = <<INCLUDE_ANSIBLE_MODULE_LANG>>
 MODULE_COMPLEX_ARGS = <<INCLUDE_ANSIBLE_MODULE_COMPLEX_ARGS>>
 
-BOOLEANS_TRUE = ['yes', 'on', '1', 'true', 'True', 1]
-BOOLEANS_FALSE = ['no', 'off', '0', 'false', 'False', 0]
+BOOLEANS_TRUE = ['yes', 'on', '1', 'true', 1]
+BOOLEANS_FALSE = ['no', 'off', '0', 'false', 0]
 BOOLEANS = BOOLEANS_TRUE + BOOLEANS_FALSE
 
 # ansible modules can be written in any language.  To simplify
diff --git a/library/cloud/ec2 b/library/cloud/ec2
index 6a231095242..fc284c14a67 100644
--- a/library/cloud/ec2
+++ b/library/cloud/ec2
@@ -568,9 +568,9 @@ def main():
             image = dict(),
             kernel = dict(),
             count = dict(default='1'),
-            monitoring = dict(choices=BOOLEANS, default=False),
+            monitoring = dict(type='bool', default=False),
             ramdisk = dict(),
-            wait = dict(choices=BOOLEANS, default=False),
+            wait = dict(type='bool', default=False),
             wait_timeout = dict(default=300),
             ec2_url = dict(),
             aws_secret_key = dict(aliases=['ec2_secret_key', 'secret_key'], no_log=True),