Back-porting some logic that was specific to a former client.