This reverts commit 769511ae66. * It was assumed that the logic was incorrect but it was fine
769511ae66