Revert "Adding a (temporary?) fix for #15"

This reverts commit 5bd7b4e4c58c0f867bd3a40c327d4bb9549a38ab.

Conflicts:
	lib/controller.js