Revert ee3dda9..47b4f17

This rolls back to commit ee3dda9532ff0d074091270ee9ce7f243e7d1b51.