Revert "merge with upstream"

This reverts commit ec4bc7dbd559bf80d5df0a3a351970e982d8e287, reversing
changes made to 9790c6a0eb5f68c35886377ef194b60dadc18c85.
Revert "add filter to stock status options"

This reverts commit 9790c6a0eb5f68c35886377ef194b60dadc18c85.