Restore single-star from 55f2eb6dca