Tweaked in line with new one-port vanilli.