Revert my last commit, apparently it's a runtime issue.