diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 75ae712b88..a035d291e8 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -23,6 +23,12 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto.S3BotoStorage'
 MITX_FEATURES['ENABLE_DISCUSSION'] = False
 MITX_FEATURES['ENABLE_DISCUSSION_SERVICE'] = True
 
+# IMPORTANT: With this enabled, the server must always be behind a proxy that 
+# strips the header HTTP_X_FORWARDED_PROTO from client requests. Otherwise,
+# a user can fool our server into thinking it was an https connection.
+# See https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
+# for other warnings.
+SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
 
 ########################### NON-SECURE ENV CONFIG ##############################
 # Things like server locations, ports, etc.
diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html
index 0e2a997290..5b12942af5 100644
--- a/lms/templates/wiki/article.html
+++ b/lms/templates/wiki/article.html
@@ -33,11 +33,9 @@
       </div>
 
       {% if urlpath %}
-      <!--
       <div class="see-children">
         <a href="{% url 'wiki:dir' path=urlpath.path %}">See all children</a>
       </div>
-      -->
       {% endif %}
     </div>
   </div>