The commit was reverted and[ a new PR|https://github.com/hibernate/hibernate-orm/pull/2651] was created for 5.4.1.