Revert d8fc851..044d7e2

This rolls back to commit d8fc851a5ad608e15e1d4630380a4f4a7b83a0fb.