Revert e78a070..3f24dc2

This rolls back to commit e78a070fa79b4554565c3ad3969cc430ff4a7ab1.