Revert ugly fix