Revert to Extensionless Version