Revert bd4f5e8..730e7d9

This rolls back to commit bd4f5e80bca63cb228b093ac6bfe7668514da4e7.