Revert 20943e3..9b8f5e1

This rolls back to commit 20943e380adec2f57f9e83a9ac498b0c472a6583.