After hours of trying to rebase the commits to a31c353, I decided that it's not that significant anyways.
a31c353