Switch to supporting specific commits in the develop branch instead of HEAD. It too often needs patching or updates to existing patches.