@g0tmi1k just a quick question... does the remove_resource bug cause php_include.rb to break?  This is really a separate issue, and the team is still thinking how to properly fix this. If php_include.rb can still remain functional, then I suggest not to fix this in this pull request, we'll fix later. Also, that way we don't keep this PR hanging.