Revert "ugly and sux"

This reverts commit addad78db418387be4187217c127e7c701351c9a.