Iron Golems spawn too quickly in villages

In my solo survival world, I have been living close to a village. In order to have more trades, I placed more workplaces, and the villagers reproduced... but so did the iron golems. Originally the village had 1 or 2 iron golems, and each time I went back to the village, there were more. Last time I counted there were at least 17 iron golems in the village (At MC day 216). Apparently this issue was reported before as issue MC-145766, but for some reason the issue is "resolved" even though the problem still exists in versions after the supposed patch.