Follow-up to d098b99b: make it work.