Revert 9f4df22..6854c07

This rolls back to commit 9f4df22049410edfba159e2574b5b87c16af8d77.