This reverts commit 4d277b96ad. Woops, this wasn't meant to be committed. I just reverted it locally to test something, nothing wrong with the original commit :)
4d277b96ad