diff --git a/ember-power-select/CHANGELOG.md b/ember-power-select/CHANGELOG.md
index 4119ec437..6d27d1f4f 100644
--- a/ember-power-select/CHANGELOG.md
+++ b/ember-power-select/CHANGELOG.md
@@ -228,6 +228,9 @@
 - [BREAKING] All actions starting with `on` (e.g. `onchange` and `onopen`) are now spelled with camelCase (`@onChange` and `@onOpen`)
 - [BREAKING] @searchEnabled is now false by default
 
+# 2.3.5
+- [BUGFIX] Could not find module ember-compatibility-helpers
+
 # 2.3.4
 - [BUGFIX] Add back node 6 in the list of supported engines
 
diff --git a/ember-power-select/src/components/power-select.hbs b/ember-power-select/src/components/power-select.hbs
index d055cd31d..7787d2b5c 100644
--- a/ember-power-select/src/components/power-select.hbs
+++ b/ember-power-select/src/components/power-select.hbs
@@ -83,8 +83,8 @@
           @ariaActiveDescendant={{concat publicAPI.uniqueId "-" this.highlightedIndex}}
           @ariaLabelledBy={{@ariaLabelledBy}}
           @ariaLabel={{@ariaLabel}}
-          as |opt term|>
-          {{yield opt term}}
+          as |opt select|>
+          {{yield opt select}}
         </Trigger>
       {{/let}}
     </dropdown.Trigger>
@@ -190,106 +190,4 @@
       {{/if}}
     </dropdown.Content>
   {{/let}}
-</BasicDropdown>
-{{!-- <BasicDropdown
-  @horizontalPosition={{@horizontalPosition}}
-  @destination={{@destination}}
-  @initiallyOpened={{@initiallyOpened}}
-  @matchTriggerWidth={{this.matchTriggerWidth}}
-  @preventScroll={{this.preventScroll}}
-  @onClose={{this.handleClose}}
-  @onOpen={{this.handleOpen}}
-  @registerAPI={{this._registerAPI}}
-  @renderInPlace={{@renderInPlace}}
-  @verticalPosition={{@verticalPosition}}
-  @disabled={{@disabled}}
-  @calculatePosition={{this.calculatePosition}}
-  ...attributes as |dropdown|>
-  <dropdown.Trigger
-    @eventType={{or @eventType "mousedown"}}
-    {{on "keydown" this.handleTriggerKeydown}}
-    {{on "focus" this.handleTriggerFocus}}
-    {{on "blur" this.handleTriggerBlur}}
-    class={{this.concatenatedTriggerClasses}}
-    id={{@triggerId}}
-    role={{this.triggerRole}}
-    aria-describedby={{@ariaDescribedBy}}
-    aria-invalid={{@ariaInvalid}}
-    aria-label={{@ariaLabel}}
-    aria-labelledby={{@ariaLabelledBy}}
-    aria-required={{@required}}
-    title={{@title}}
-    tabindex={{and (not @disabled) (or @tabindex "0")}}>
-    {{#let (component this.triggerComponent) as |Trigger|}}
-      <Trigger
-        @htmlTag={{this._triggerTagName}}
-        @allowClear={{@allowClear}}
-        @buildSelection={{@buildSelection}}
-        @extra={{@extra}}
-        @listboxId={{this.optionsId}}
-        @loadingMessage={{this.loadingMessage}}
-        @onFocus={{this.handleFocus}}
-        @onBlur={{this.handleBlur}}
-        @onInput={{this.handleInput}}
-
-        @onKeydown={{this.handleKeydown}}
-        @searchEnabled={{@searchEnabled}}
-        @searchField={{@searchField}}
-        @select={{this.publicAPI}}
-        @selectedItemComponent={{@selectedItemComponent}}
-        as |opt term|>
-        {{yield opt term}}
-      </Trigger>
-    {{/let}}
-  </dropdown.Trigger>
-  <dropdown.Content @htmlTag={{this._contentTagName}} class={{this.concatenatedDropdownClasses}}>
-    {{#let (component this.beforeOptionsComponent) as |BeforeOptions|}}
-      <BeforeOptions
-        @animationEnabled={{@animationEnabled}}
-        @select={{this.publicAPI}}
-        @searchEnabled={{@searchEnabled}}
-        @searchPlaceholder={{@searchPlaceholder}}
-        @listboxId={{this.optionsId}}
-        @onInput={{this.handleInput}}
-        @onKeydown={{this.handleKeydown}}
-        @onFocus={{this.handleFocus}}
-        @onBlur={{this.handleBlur}}
-        @extra={{@extra}}
-        @placeholder={{@placeholder}}
-        @placeholderComponent={{this.placeholderComponent}}
-        @selectedItemComponent={{@selectedItemComponent}}/>
-    {{/let}}
-    {{#if this.mustShowSearchMessage}}
-      {{#let (component this.searchMessageComponent) as |SearchMessage|}}
-        <SearchMessage @searchMessage={{this.searchMessage}} @select={{this.publicAPI}}/>
-      {{/let}}
-    {{else if this.mustShowNoMessages}}
-      {{#if this.noMatchesMessage}}
-        <ul class="ember-power-select-options" role="listbox">
-          <li class="ember-power-select-option ember-power-select-option--no-matches-message" role="option">
-            {{this.noMatchesMessage}}
-          </li>
-        </ul>
-      {{/if}}
-    {{else}}
-      {{#let (component this.optionsComponent) as |Options|}}
-        <Options
-          @loadingMessage={{this.loadingMessage}}
-          @groupIndex=""
-          @extra={{@extra}}
-          @select={{this.publicAPI}}
-          @options={{this.publicAPI.results}}
-          @optionsComponent={{Options}}
-          @highlightOnHover={{this.highlightOnHover}}
-          @groupComponent={{this.groupComponent}}
-          id={{this.optionsId}}
-          class="ember-power-select-options" as |option term|>
-          {{yield option term}}
-        </Options>
-      {{/let}}
-    {{/if}}
-    {{#let (component this.afterOptionsComponent) as |AfterOptions|}}
-      <AfterOptions @select={{this.publicAPI}} @extra={{@extra}}/>
-    {{/let}}
-  </dropdown.Content>
-</BasicDropdown> --}}
+</BasicDropdown>
\ No newline at end of file