I reverted it to being a required patch in 8077d0a