Fix source location for merging into nicklockwood's repo