Revert 86233a1..78f6fd6

This rolls back to commit 86233a1ef20844791297eabb3474ddd927935069.