Revert 8e8b8ab..c09a67d

This rolls back to commit 8e8b8abf62af3de85d65425c55ee0b740bb8b8a3.