Revert Olli's commit