Revert 8ee3495..de43ca4

This rolls back to commit 8ee3495750cdb234559f30a3d47b1efe5db16c4a.