Reverted last unrelated changes