Manually merged changes to get method gallery living in the right spot.