Fixing backwards compatibility issue -- cannot simply rename existing methods
Merge branch 'master' of git://github.com/Netflix/zeno