Revert "failing 2 things"

This reverts commit 4ef7382188c260a7dfc35c9ee37f74572c155ab6.