Revert 4fdd7db..5f82498

This rolls back to commit 4fdd7dbea14610dc9465fe311fe2ae1508ed8ad6.