Fixes Bug 1114743, remove optimizely