Fix bad merge

This PR fixes incorrectly resolved merge conficts at 9fb21a1dfe21fa which reverted changes by @yoichi