Reverts previous commit. Consider revising with a truly dependency-free method.