Revert 12ff3f8..3de49d1

This rolls back to commit 12ff3f8966947f45a999c41d4e4991a4427dd40e.