Revert e838e9d..f1c2588

This rolls back to commit e838e9da308be22cbc4f3dec174b054f2dada017.