[configuration] Undo code breakage