Revert "Integration fix"

This reverts commit 77265ba22d7a0182f574dd48f4caec896be8bead.
Merge branch 'master' into fixt