Reverted some files in this branch to make minimal PR.