Argh, removing Apache submodule *again*
Add puppetlabs/apache fork