Revert 5d28481..40e749f

This rolls back to commit 5d284818b603876f636be79170aaa352a848dac2.
Revert 40e749f..c67a554

This rolls back to commit 40e749fd32cf866e8b2bd155516a5a439b1f154e.
memory not enough?