Revert e4a0b47..42a58b0

This rolls back to commit e4a0b475705ebdff84f7c7a732a3d9366128fb51.
Revert "Revert e4a0b47..42a58b0"

This reverts commit d3d1cbbb6ab0cb3dc649fa231140ec15b2648607.
fraking node modules