Since it's no longer clear under which circumstances the original problem for which the corresponding check was introduced occurred, and I wan't able to reproduce it, I revert it temporarily to see whether it's still worth keeping.