Revert "Fix modules build"

This reverts commit 195fc5d963750cb8f13ef51a6471a0adb756e242.