Revert to bf44eb46db15ae6e8e... (previous commit was wrong)