Further reverted change