Revert "fixes"

This reverts commit e0cb6bd9fe176916ea8aec108852556f96c6bb22.