Restore basic functionality and remove old directive.