Revert 25cddc9..a50e607

This rolls back to commit 25cddc9e3c63f5fa7ad535d47a310ed004049413.