Issue #2551263 by Berdir, nod_: Deleting entity/field models when markup is removed can result in JS error