Revert "update nl - attempt 2"

This reverts commit 4712b78e520ca10b34e3e9b99c2752b10d811b42.
Revert "Revert "update nl - attempt 2""

This reverts commit 8e179aa73495f93151943293df32cde9f2c3848f.
Revert "Merge pull request #583 from git-marijus/master"
autoload broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123b283a096af302b0366255355ba8439, reversing
changes made to 4712b78e520ca10b34e3e9b99c2752b10d811b42.