Forcing the exclusion of Ben's merge commit