Partially reverting 7c5310e1a2
Partially reverting 7c5310e1a2

silverstripe/silverstripe-subsites,mandrew/silverstripe-subsites,dnadesign/silverstripe-subsites,mikenz/silverstripe-simplesubsites,dnadesign/silverstripe-subsites,wernerkrauss/silverstripe-subsites,silverstripe/silverstripe-subsites,mandrew/silverstripe-subsites,danaenz/silverstripe-subsites,danaenz/silverstripe-subsites,mikenz/silverstripe-simplesubsites,wernerkrauss/silverstripe-subsites