Revert 79b3e03 and cb44a35 for this branch.