Revert "Fix ups"

This reverts commit 289a93b784bc92b6127d5163a4fb8c70082d491a.