Revert "Merge branch 'avoid-json-parsing-of-null'"

This reverts commit 4dfbecd2f9cb23ba25cd6be545827067623a31c5, reversing
changes made to bc0e0c927acac3d5a35fb7fe864de7f393f90c80.

Conflicts:
	bower.json
Guard against JSON.parse(null) and simply return null