I left as is until we hear otherwise. Thanks @aequasi and @shocm.

Also, I hope you like movie references.. I have decided that every pull request's title will be a movie reference from here on out ;)