This reverts the py part of 8c974485.
go parts of this patch are handled in 70c0a984e03083ea35678de9ac7599a2364a355d.