Revert 2c3081f..fe18e8a

This rolls back to commit 2c3081fd447eb06541449aac2e03804459b704ed.