I have removed this line from property-defaults-back-in, so it is essential, that this branch makes it into the master.