I agree with @c089 and @lo1tuma -- let's take this out of this PR and merge #261 with this change.