Revert "blackfix 42-2"

This reverts commit 98a90d7fabd66fcd4a67d8712d6dba6b42ab6a3e.