Revert changes to cb1cbf0846253546d

All next commits were not correct.