Fix for overenthusiastic merging by @robwebset ;)