Revert 8b7f8b6..a82d294

This rolls back to commit 8b7f8b6a6e5dabd8b8e1a4f8319ca27c33c20d11.