Note to myself, this block must be removed before merging.