Revert "Merge pull request #401 from joek/uaa_base"

This reverts commit 17f63b55a3469930e8b1439b858a7efea70b6f8e, reversing
changes made to d0a80720b571bfe1a7ad9f22b6cd932b3c244c73.

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotallabs.com>