Revert commit 255d4c646c0d7aa6b049052fef47fa083b1b1506 and solve