I think this should be either updated or removed from this PR, if I'm wrong @eLobato would you mind explaining the necessity of this?