Revert c76e4791d3ae4f180fba209c29bd3774c00858cf - "Fix the logic bug that caused...