Roll back #1161 after negative feedback