Revert 6174506..eac32d9

This rolls back to commit 6174506d985eb2bd2204db8843d58a31b68be43a.