Revert fa03749..4e61d77

This rolls back to commit fa037492acf729745719e28c348bbd2cdacf164b.