Revert to working commit

This reverts commit debb5c745f6340678d0593ea87e42413468eb522.