Revert "567 branch"

This reverts commit ee31f89ee4039c97125e35be615eefa7f1e89b6b.
123456