This reverts commit 13389ca8c53fdf649d1f9b7b9ba7d38e31baa438. In case we can extract a common function or stuff.