Revert "rpearce/tdenley: Swap args to prevent silly race condition with refstack"

This reverts commit 8ed7523291a77c78c59f69d423f9ab285ee728a0.
rpearce/tdenley: Make ci_slave backward compatible to prevent explosions