reverting #682 remnant