Revert 7914a44..3e99663

This rolls back to commit 7914a4416f482fa55c2ef62a77b4029d6b0a7aff.