Reverting CON-863 as still there is dependencies over old console