Removed weird code.
(cherry picked from commit 48d0bb3)