Revert "1122-17"

This reverts commit 235f16cda568d0fa1e26fd318172afa9bef0b5b6.
Revert "1122-15"

This reverts commit e8193f05c252d421afab2fa637713ef53eabb116.