all in
Revert "all in"

This reverts commit 574ed6e3852c5077edbe6163433137ac32cdb3fa.
Merge remote-tracking branch 'origin/master'