This reverts commit de918b9234b99f91a0a364fc675533147581eb2e. The code doesn't work as expected. Reverting