Revert "Temp solution removed"

This reverts commit cd166f90f34df1fb07726452487c2fdc816f3b5d.