[Feature] Commented out lines no longer required (based on commit a4648a0)