Remove commit #f9602f4f84e4d60890009b60254a73a7f5a41a85

Generate tons of issue and not seen any improvements. Disabled for now.