Revert "Reverted changes by @owenversteeg"

This reverts commit a0f9f06fd0b51b7f9337ca32bedeafc77abc0be6.
Broken Code

Please verify your code doesn’t return an undefined err, @owenversteeg,
before committing it