Side note, I created a card for this: https://trello.com/c/t71Nmm6L