Revert 6a017a2..de4d8fc

This rolls back to commit 6a017a226afb4711a324df49088ca1cb09939299.