Revert "Move to intentional failure due to confusion"

This reverts commit 9141fd259803f7c04b76ee65958231e29099e566.