Revert 6da4052..a23a393

This rolls back to commit 6da40520abdcc5196c515e0db8c4fb61f5f2842f.