BZ-8668 reverted build partials fix