Removed 'if false' that was removing metadata