Restore properties mistakenly removed (broke merging)