Revert f9a010a..c33a8fc

This rolls back to commit f9a010ab9dabb811e6afe4bdc5dc71660ee3904d.