#1256 More apache mimicry