Re-apply changes accidentally removed with previous commit