Revert 842f8d4..9e71aec

This rolls back to commit 842f8d4266b031258f64d8e56ec5f379951c0835.