Undo 9d65e2a3471fb5a5d2c7c58417b426b0573023c9 because of problem on large-devices