Revert "Working solution for #49, needs verification."

This reverts commit 73cc391cc5f563f819a3ff0dcfb08dc375425861.