Revert "Merge pull request #1725 from Gozala/detraitify-content-loader"

This reverts commit b252a7be47cc9460f0218ad96170619e2b011278, reversing
changes made to 0f12cfa1c48f35c5829bcd66511693a79d567f4f.