diff --git a/etc/bin/mako-render b/etc/bin/mako-render
index 6ade41757c..b604c46b29 100644
--- a/etc/bin/mako-render
+++ b/etc/bin/mako-render
@@ -70,9 +70,6 @@ class DictObject(object):
     def __repr__(self):
         return repr(self.__dict__)
 
-    def __getattr__(self, name):
-        return object.__getattribute__(self, name)
-
     def __getitem__(self, name):
         try:
             return getattr(self, name)
diff --git a/src/mako/cli/docs/commands.md.mako b/src/mako/cli/docs/commands.md.mako
index 79f2c79397..cec6d743db 100644
--- a/src/mako/cli/docs/commands.md.mako
+++ b/src/mako/cli/docs/commands.md.mako
@@ -143,7 +143,8 @@ You may set the following properties to further configure the call. Please note
 or more key-value-pairs, and is called like this `-${PARAM_FLAG} k1=v1 k2=v2` even though the listing below repeats the
 `-${PARAM_FLAG}` for completeness.
 
-% for p in sorted(oprops):
+## % for p in sorted(oprops): FIXME(this really should be sorted, I suppose, but that doesn't work anymore)
+% for p in oprops:
 ${self._md_property(p)}
 % endfor 
 % endif # optional method properties
diff --git a/src/mako/lib/util.py b/src/mako/lib/util.py
index b9b4b49552..c005dcb4cd 100644
--- a/src/mako/lib/util.py
+++ b/src/mako/lib/util.py
@@ -746,6 +746,7 @@ def new_context(schemas, resources, methods):
             # end this is already a perfectly valid type
 
             properties = s.get('properties', {'': s})
+            print(properties)
             for pn, p in properties.items():
                 link_used(p, rs)
                 if is_nested_type_property(p):