Revert "A big bug and the case is still open"

This reverts commit cbeb98a0d848402d6c4bb933f64fc973aada9f51.