Revert 2a80aee..f3df512

This rolls back to commit 2a80aeee198e4999a499d009ab25912bfe72b883.