This reverts commit 8c207cf1eb.
8c207cf1eb
This reverts commit e1922bd555.
e1922bd555
Update 4.6 See merge request harukin/core!68