[BUGFIX] Essentially reverting b1adfdde and resolving the issue it was trying to fix.