Revert 69abb3e..8582261

This rolls back to commit 69abb3e8499484af87f51fef975a83eafed8aa2b.