re-enable modules

Change-Id: I739a3cf10915c217ed6f4a72aa6054f817df6201