re-enable modules

Change-Id: I541006990fd707de010b40bb28334d165dc25aa0