Revert "Getting unit list working."

This reverts commit 6ec0499351bcd5fedf9eda7a4c93c8f0cef0b4e6.