Revert "Escape hatch added"

This reverts commit b5a051b98d623754c773235cdb6f86a00c651a18.