Revert "Making uber more awesome"

This reverts commit 9b5aceab100adc2615f9f5dc64513152677e8f45.