Reverted commit 036d3d3 to 3bd445e since they dont belong to this branch