Revert "[TW133] - Another attempt to fix the black knight"

This reverts commit 7dd6f4e33393694496be0f53fe108796fc8439de.