Revert 2690

[tibers]

Revert #2690

Pull request:
#2693

Justification will be written as a song on myspace.

[hmdne]

@hsbt Also this one

[hmdne]

Btw. this issue, #2693 and #2695 can be closed as all 3 are about reverts and you just did a revert.

[hsbt]

@hmdne Thanks