This reverts commit a7e0c005c0e726c50cd837e130039f9e3f00dd01.
This reverts commit d13e170f22dc3638f335e8e8015907190847ef36.
V2 (Laravel re-make)