Revert 3d6be63..260d918

This rolls back to commit 3d6be63da875407641688773a1cd4523c644dff7.