Solve some more problems
Revert "Merge commit '68ad1238dbfaecbe55cc552c8a350fba72be6c93'"

This reverts commit b14a2ecb0084323e63052b46d5057842f59068f7, reversing
changes made to faf14d752b2d39409af90c9fa34f2e30006715c5.
Committed