Reverted commit of wrong version of Lucians changes