Revert "Merge remote-tracking branch 'pump17/master' into e14n"
Revert "Merge remote-tracking branch 'pump17/master' into e14n"

This reverts commit 4c1fbe7e5f30b74066e51a7826936b85f8cf69a5, reversing
changes made to 06201647b9007599090d59c90e99dd1cdb14c55a.

profOnno/pump.io,profOnno/pump.io,Acidburn0zzz/pump.io,detrout/pump.io,strugee/pump.io,pump-io/pump.io,stephensekula/pump.io,pump-io/pump.io,Acidburn0zzz/pump.io,pump-io/pump.io,e14n/pump.io,gabrielsr/pump.io,landsurveyorsunited/pump.io,e14n/pump.io,stephensekula/pump.io,OpenSocial/pump.io,e14n/pump.io,gabrielsr/pump.io,strugee/pump.io,detrout/pump.io,landsurveyorsunited/pump.io,stephensekula/pump.io,OpenSocial/pump.io