Revert b34929e0ad - That was plain dumb