Revert "Merge pull request #124 from phansys/upgrade_3.x"
Revert "Merge pull request #124 from phansys/upgrade_3.x"

This reverts commit dabad8db0c50b523ca6d3adadcb473557d7be402, reversing
changes made to 36f04931879e430d37ed1c806d1efe32b5d8b06d.

hackzilla/TicketBundle,hackzilla/TicketBundle