Revert 0dbb4a0..afe0d1d

This rolls back to commit 0dbb4a011bd8e8474587555e09dea4ee1f8189b1.