Revert 24597c4..70ba087

This rolls back to commit 24597c4701435e1af0ee83cbee209f731ef4def4.