Revert 8ff0cdc..8bb3ed8

This rolls back to commit 8ff0cdc2a6b1692abf9fd68a094047a0280440aa.