diff --git a/configs/cli_aliases.conf.sample b/configs/cli_aliases.conf.sample
index 1d9cd9107d..79e49b2d70 100644
--- a/configs/cli_aliases.conf.sample
+++ b/configs/cli_aliases.conf.sample
@@ -27,6 +27,7 @@ hangup request=channel request hangup
 originate=channel originate
 help=core show help
 pri intense debug span=pri set debug 2 span
+reload=module reload
 
 ; CLI Alias Templates
 ; -------------------
diff --git a/main/cli.c b/main/cli.c
index b6e99834c6..f3e3e6e227 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -266,11 +266,6 @@ static char *handle_load(struct ast_cli_entry *e, int cmd, struct ast_cli_args *
 	return CLI_SUCCESS;
 }
 
-/*!
- * \bug The command "reload" needs to be re-added.  Requiring "module reload" to reload everything,
- *      including core stuff, doesn't really make sense.  Adding a "core reload" to reload everything,
- *      including modules, also doesn't really make sense.  So, we should put "reload" back.
- */
 static char *handle_reload(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	int x;