Revert f2d6b28..e98c875

This rolls back to commit f2d6b286d647908c0650c19c5728545083b68496.