This reverts commit 434fed5a. Post commit review suggested to use another implmenentation. Detailed can be found in the review.