Revert "Flatten gems"

This reverts commit 6d88149e3955c3b6be160dc6f466eebe923b9e42.
Revert "Update gems"

This reverts commit 72dfb8d360e76c264b8c049502061cc7d1e30029.