Revert breaking commit

This reverts commit 8a991fd6f5649e422c3d62632bfc878a557e2bc8.