Revert 488f84e since f589df0 provides a better solution