This change might be performance critical and has to be timed
carefully. Thus it is possible to switch back to the old
implementation. The new one, however, can actually be debbuged