Revert bdeac2d..b37abc7

This rolls back to commit bdeac2d25705bd66a3a186b2679ab3835199467a.