Mostly, detect the situation I suspect is responsible for the current problems in #1264 (closed).
CC @omni