(Rolling these back for now) Revert "Merge pull request #1 from PHP-Outburst/develop"

This reverts commit e0ba69839540339b3570383415ef8fba4125791c, reversing
changes made to b629a337d2497a0c6587a70064543b58fd51edb1.
(Rolling these back for now) Revert "Merge pull request #3 from rwchhs/develop"

This reverts commit 9b67d8b97d94ade06774efa0cec9ba50ce63bc44, reversing
changes made to ed80946ba899a2b523177ee083ac3f788465cbf5.