Revert 8fc25db..87f261c

This rolls back to commit 8fc25db05086eb8c0101300adc79e5968ff81b8b.