In addition I'm no longer passing this option around, instead calling it where needed. This _might_ fix #175 as the variable is being set very early on in bootstrap.php