This change has the same problems as with the property removal.