Revert 160993 - Revert 160976 - The center of a rect is x+width/2, y+height/2