Putting back stuff that got removed due to wrong trunk-to-branch merge.