Readd accidentally removed code by b1434db6ae893cc745e4f5b74ea8cf4e6e3b49e3 .

Reviewed by: Trust me.