Speculatively revert commit 148175 (rafael), to see if this fixes