Sorry about the spam, I just squashed the two commits together.