Re-added erroneously commented-out lines