Revert "Remove redundant logic"

This reverts commit 99fc25201b6f862ba1cf509bcb939c9276069cc7.
Remove redundant logic, w/o node_modules mess