Revert bf43976..944acca

This rolls back to commit bf4397680043d75ff21005d201fc7194d1a7620f.
Retry