Cleaned up the previous change, removing commented line and all reference to opts.