Reassert extended branch version flavour again after merge from 0.7.6-post-fixes
Revert "Reassert extended branch version flavour again after merge from 0.7.6-post-fixes"

This reverts commit 2a482c22bcbfbda043e050414ea19f33ce3e079d.