Reverting to the old ways, so build doesn't break