This reverts commit fa766b61bcf5dcc1f241c96521b56304a0e3ba11. Not going to follow this path right now