Revert be63bb5..f939d20

This rolls back to commit be63bb58a9cac0a3bf5f68a35f8b4da74de66a7a.