Revert 40c59a1b