Revert 5c7f3a3..d8ad14f

This rolls back to commit 5c7f3a3fb8aa713ba96c821017e361b10b5f0302.