Removing unnecessary code (cherry picked from commit 1f7ec24) (cherry picked from commit 0738e54)
Fixing failing integration tests (cherry picked from commit 7d3e36b) (cherry picked from commit c19bf05)