take back accidental merge by hand

refers to 16a32e47fe3fa9574049ae2de75e3805a336f605