Revert 1c9cd56..df83a4b

This rolls back to commit 1c9cd56fba1e3499d934ba90a9bac92fa193c4a6.