Restore constructor that was deleted, reduce white space diffs