Readded some code that was removed by mistake in previous commit.

2017-03-31, dgaberscek