Backing out changes for reduced expander POC.