Revert 513fc85..0b86066

This rolls back to commit 513fc85a60bc9a5fe01c9eccd5432b579a82bf86.