Reapplying the changes. Reverted it wrongly yesterday This reverts commit 3c6523dcb8ebc0396f69c578285599b66e16dce7.