Minor refactoring

Bring back the broken method to simulate expected failure.