Revert "Merge branch 'TY' of https://github.com/tpgscm/BE into TY"

This reverts commit 8e088e0babc1573765712aa566dff0ebd17d9b2b, reversing
changes made to 009ca4a668d8c6cd778442da8917a9a4a2fbe7a7.