Revert f6ec351..d34cad1

This rolls back to commit f6ec351e22aa6784c11308a2af4e5c8c7747de89.