Revert e21c33f..ae9d86d

This rolls back to commit e21c33f785c5115ca3a89a3736ddc6e5d8358f85.