There is a better way, duh (+1 squashed commit)
Squashed commits:
[2ba9a1c] Revert "I don't understand why this can't be automatic."

This reverts commit e4d292e26ff11b4e115dc73621dd321fe5b07e75.