Revert 94382f5..9a0fe26

This rolls back to commit 94382f5e7d8d7ede6618101c189105303054de1b.