MAP-504: re apply this fix. it got lost somewhere along the way