Revert r223980 as it had wrong commit message.