Revert f8e34a8..6f16d8f

This rolls back to commit f8e34a82d44f160b41c66fa381affe118fe2387a.