Reverting change of previous commit
Authored by: vectorsigma 2018-06-23
Parent: [r157]
Child: [r159]