Revert "fix conflict merge"

This reverts commit d8817e5c124139895bedfd8d4584ce3b56a17446, reversing
changes made to d400e9dc2d0c026c37c6a618e93c4af4cf7b7a32.
Revert "Fix integration schedule"

This reverts commit d400e9dc2d0c026c37c6a618e93c4af4cf7b7a32.
Fix integration schedule