Reverting 5437aed69554b031dac79a71b16286b06de23571 

Revert done per consultations with author and notes in the ticket. @RafLeszczynski  @themech , please take a look and merge if OK