Revert d735381, see #270