Revert 1f7dc6e..8eff609

This rolls back to commit 1f7dc6ea3126e30a9b0bda3be5c8d4d9e6664475.