Re #1709 Removed variable for Corelib until we find an elegant
non-breaking solution