elementary: fix massive breakage.