Revert 158f522..42ba9da

This rolls back to commit 158f5223e513515030bcd778f45e69291b5fd34c.