Reverting 302339fce748f6ad83163f520a0b26cf35c5bb35
Merge remote-tracking branch 'loopj/master'