Merge pull request #2973 from booto/revert-vi-enb Revert "Merge pull request #2943 from booto/vi-enb"
