Revert 6dc94a8..2c86683

This rolls back to commit 6dc94a80cbc784f26da7097478e49c17a51aeb7a.