add back stuff I removed by mistake

(cherry picked from commit e05a5d8e8190b7069814cebc7be3718df80de485)