Updated to use tim-stable-rebased branch again.