Bring back change from commit d1ed6f7