Follow-up on 27e418e8; Make it more explicit dependency