Revert "22/11 evening heng 2"

This reverts commit 7fc76ee5347369d4349f4162e04eac6ec2e27cd4, reversing
changes made to 104d5e27b76e9f4cf87deba95c5b2d6a48cf4683.
Revert "22/11 evening heng"