Revert d291ded..9803676

This rolls back to commit d291ded86782ea4ec4b4dcee2c5dcbbfb49e1745.