Revert my patch from yesterday. Need to take more time to work on it.